From: Iñigo Martínez <inigomartinez@gmail.com>
Date: Tue, 30 Jan 2018 12:37:38 +0000 (+0100)
Subject: build: Update gvc to support renamed options
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~994^2^2~101
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6e74f987ec8d63bd1b85b41825aef94f8338558c;p=gnome-shell.git

build: Update gvc to support renamed options

gvc has made some recent changes that rename its user options
following meson guidelines for GNOME packages[0].

The options used in gvc as a subproject have been renamed
accordingly.

[0] https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting
---

diff --git a/meson.build b/meson.build
index 88766b3e4..1eec6aa27 100644
--- a/meson.build
+++ b/meson.build
@@ -167,12 +167,12 @@ conf_inc = include_directories('.')
 
 libgvc = subproject('gvc',
   default_options: [
-    'package-name=' + meson.project_name(),
-    'package-version=' + meson.project_version(),
+    'package_name=' + meson.project_name(),
+    'package_version=' + meson.project_version(),
     'pkgdatadir=' + pkgdatadir,
     'pkglibdir=' + pkglibdir,
     'static=false',
-    'with-introspection=true',
+    'introspection=true',
     'alsa=false'
   ]
 )
diff --git a/subprojects/gvc b/subprojects/gvc
index 67533bffd..6a0ac9ba6 160000
--- a/subprojects/gvc
+++ b/subprojects/gvc
@@ -1 +1 @@
-Subproject commit 67533bffdcd22893b28baa411b2e75bd75dce323
+Subproject commit 6a0ac9ba69f84d763f286c5741b57ff8d87c1f45